Merge from emacs-24; up to r110832
authorGlenn Morris <rgm@gnu.org>
Sat, 10 Nov 2012 23:13:33 +0000 (15:13 -0800)
committerGlenn Morris <rgm@gnu.org>
Sat, 10 Nov 2012 23:13:33 +0000 (15:13 -0800)
commit1c905a01c7fc05454ad41171be74c21a9413fa6f
tree438f509c4de2f189f048dcfb62633c6cff686b65
parent9e77b8eb8142b723400b973a7857e67990aec449
parente8f2a771d03fcd36954f373d6cb30a40a8868507
Merge from emacs-24; up to r110832
12 files changed:
doc/emacs/ChangeLog
doc/lispref/ChangeLog
doc/misc/ChangeLog
etc/NEWS
lisp/ChangeLog
lisp/emacs-lisp/advice.el
lisp/emacs-lisp/cl-extra.el
lisp/emacs-lisp/cl-lib.el
lisp/emacs-lisp/gv.el
src/ChangeLog
src/window.c
src/xdisp.c